Remove steps related to syncing of the "alive" branch #551
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- name: Sync upstream changes - name: New commits found - name: No new commits - name: Show value of 'has_new_commits Create the "alive" branch from main, not dev The "alive" branch is still automatically created, and "keep alive" commits will be added to the "alive" branch to avoid a stale repository. This will avoid errors when updating the alive branch causes merge conflicts.
|
I have tested this successfully, both with an alive branch in place that would otherwise cause failed build due to merge conflicts, as others have reported on Discord. Then, no merges were attempted, but a keep-alive commit was inserted into the "alive" branch to avoid staleness. I have also tested running the build workflow after deleting the alive branch, which was successfully created, from main and not dev. The alive branch never needs to be synced, but can be synced manually. It can also be deleted at any time without issues. |
|
Ready for merging? |
|
Yes |
mountrcg
added a commit
to mountrcg/iAPS
that referenced
this pull request
Mar 7, 2024
…_alive Remove steps related to syncing of the "alive" branch
mountrcg
added a commit
to mountrcg/iAPS
that referenced
this pull request
Mar 20, 2024
…_alive Remove steps related to syncing of the "alive" branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Create the "alive" branch from main, not dev
The "alive" branch is still automatically created, and "keep alive" commits will be added to the "alive" branch to avoid a stale repository.
This will avoid errors when updating the alive branch causes merge conflicts.